Autogenerated HTML docs for v1.8.3.1-585-g9832c
diff --git a/RelNotes/1.8.4.txt b/RelNotes/1.8.4.txt index 0976546..69ab64e 100644 --- a/RelNotes/1.8.4.txt +++ b/RelNotes/1.8.4.txt
@@ -35,13 +35,19 @@ UI, Workflows & Features + * "git rm" gives a single message followed by list of paths to report + multiple paths that cannot be removed. + + * "git rebase" can be told with ":/look for this string" syntax commits + to replay the changes onto and where the work to be replayed begins. + * Many tutorials teach users to set "color.ui" to "auto" as the first thing after you set "user.name/email" to introduce yourselves to Git. Now the variable defaults to "auto". - * "git status" learned status.branch and status.short configuration - variables to use --branch and --short options by default (override - with --no-branch and --no-short options from the command line). +### * "git status" learned status.branch and status.short configuration +### variables to use --branch and --short options by default (override +### with --no-branch and --no-short options from the command line). * "git cmd <name>", when <name> happens to be a 40-hex string, directly uses the 40-hex string as an object name, even if a ref @@ -52,7 +58,8 @@ * "git rebase" learned "--[no-]autostash" option to save local changes instead of refusing to run (to which people's normal - response was to stash them and re-run). + response was to stash them and re-run). This introduced a corner + case breakage to "git am --abort" but it has been fixed. * Instead of typing four capital letters "HEAD", you can say "@" now, e.g. "git log @". @@ -147,6 +154,9 @@ track are contained in this release (see release notes to them for details). + * "cherry-pick" had a small leak in an error codepath. + (merge 706728a fc/sequencer-plug-leak later to maint). + * Logic used by git-send-email to suppress cc mishandled names like "A U. Thor" <author@example.xz>, where the human readable part needs to be quoted (the user input may not have the double quotes
diff --git a/config.txt b/config.txt index 8a975a6..1153585 100644 --- a/config.txt +++ b/config.txt
@@ -199,6 +199,9 @@ amWorkDir:: Advice that shows the location of the patch file when linkgit:git-am[1] fails to apply it. + rmHints:: + In case of failure in the output of linkgit:git-rm[1], + show directions on how to proceed from the current state. -- core.fileMode:: @@ -2075,14 +2078,6 @@ relative to the repository root (this was the default for Git prior to v1.5.4). -status.short:: - Set to true to enable --short by default in linkgit:git-status[1]. - The option --no-short takes precedence over this variable. - -status.branch:: - Set to true to enable --branch by default in linkgit:git-status[1]. - The option --no-branch takes precedence over this variable. - status.showUntrackedFiles:: By default, linkgit:git-status[1] and linkgit:git-commit[1] show files which are not currently tracked by Git. Directories which
diff --git a/git-config.html b/git-config.html index 302618b..8db1bbe 100644 --- a/git-config.html +++ b/git-config.html
@@ -912,6 +912,18 @@ <div class="paragraph"><p>See also <a href="#FILES">[FILES]</a>.</p></div> </dd> <dt class="hdlist1"> +--local +</dt> +<dd> +<p> + For writing options: write to the repository .git/config file. + This is the default behavior. +</p> +<div class="paragraph"><p>For reading options: read only from the repository .git/config rather than +from all available files.</p></div> +<div class="paragraph"><p>See also <a href="#FILES">[FILES]</a>.</p></div> +</dd> +<dt class="hdlist1"> -f config-file </dt> <dt class="hdlist1"> @@ -1547,6 +1559,15 @@ <a href="git-am.html">git-am(1)</a> fails to apply it. </p> </dd> +<dt class="hdlist1"> +rmHints +</dt> +<dd> +<p> + In case of failure in the output of <a href="git-rm.html">git-rm(1)</a>, + show directions on how to proceed from the current state. +</p> +</dd> </dl></div> </div></div> </dd> @@ -5525,24 +5546,6 @@ </p> </dd> <dt class="hdlist1"> -status.short -</dt> -<dd> -<p> - Set to true to enable --short by default in <a href="git-status.html">git-status(1)</a>. - The option --no-short takes precedence over this variable. -</p> -</dd> -<dt class="hdlist1"> -status.branch -</dt> -<dd> -<p> - Set to true to enable --branch by default in <a href="git-status.html">git-status(1)</a>. - The option --no-branch takes precedence over this variable. -</p> -</dd> -<dt class="hdlist1"> status.showUntrackedFiles </dt> <dd> @@ -5807,7 +5810,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-05-17 16:33:07 PDT +Last updated 2013-06-24 14:55:00 PDT </div> </div> </body>
diff --git a/git-config.txt b/git-config.txt index d88a6fc..19a7be0 100644 --- a/git-config.txt +++ b/git-config.txt
@@ -114,6 +114,15 @@ + See also <<FILES>>. +--local:: + For writing options: write to the repository .git/config file. + This is the default behavior. ++ +For reading options: read only from the repository .git/config rather than +from all available files. ++ +See also <<FILES>>. + -f config-file:: --file config-file:: Use the given config file instead of the one specified by GIT_CONFIG.
